Repository navigation
chore(sync): merge Yarden-zamir/t3code main - #38
Merged
Merged
Conversation
…oute (pingdotgg#37888) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#37881) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…r an awaited Monitor ends (pingdotgg#37901)
…gdotgg#37903) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rees (pingdotgg#26820) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… start (pingdotgg#23932) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…updater under npx (pingdotgg#37917)
Co-authored-by: chomamateusz-agent <chomamateusz-agent@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
# Conflicts: # apps/server/src/vcs/GitVcsDriverCore.ts # apps/web/src/components/chat/QueuedRunsControl.tsx
…fuzzy matches (pingdotgg#37925) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…5300) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…37896) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Upstream added the server setting usageHistoryRetentionDays (pingdotgg#28111). The machine map test needs every setting key in exactly one column; it is a shared-only setting like the other usage keys.
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…17-0522 chore(sync): merge pingdotgg/t3code main
…9259) Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…ingdotgg#19261) Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…pingdotgg#19270) Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…17-1122 chore(sync): merge pingdotgg/t3code main
…otgg#38114) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…unts its tree The image-only send test waited on the launch RPC with no bound, so a refused send ran to the test deadline and left the tree mounted for the next six tests. The wait now has a bound with a reason. The render helper also unmounts on test end, so a timeout in any browser test no longer cascades. The compressing toast told the user to send again once the thumbnail appears, but the thumbnail shows during compression; it now says to wait for the compression.
…numbers (pingdotgg#38116) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…t-bound test(web): a refused image send fails fast, and a timed-out test unmounts its tree
…ustom CSS (pingdotgg#38134) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#38139) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… returns (pingdotgg#38132) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…17-1325 chore(sync): merge pingdotgg/t3code main
pingdotgg#38141) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…Codex (pingdotgg#38130) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…string (pingdotgg#38150) Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…17-1523 chore(sync): merge pingdotgg/t3code main
# Conflicts: # apps/web/src/components/settings/ForkSettingsSlot.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fork Sync run 44122449753 stopped on a merge conflict in
apps/web/src/components/settings/ForkSettingsSlot.tsx.Yarden's main moved the terminal close confirmation setting out of the fork settings rows and into the core Terminal settings panel. Our main had added the Inkwire white frame row next to it. The resolution drops the old terminal row and keeps the Inkwire row. No other file conflicted.
Machine map: the portal at map.tomcohen.dev is no longer built from this repo. Machines now join with
kitshn join <code> --server <address>.Checked locally:
vp i,vp run typecheck(42/42), and the fork tests changed since the merge base (15 files, 229 tests).🤖 Generated with Claude Code